bitkeeper revision 1.1159.1.377 (418a9f96-BWiFbfNWF-wv3xJaHdEMw)

Redo the build tree if it wasn't created completely.

diff --git a/buildconfigs/mk.linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0
index aded0d43b2d058433b46d44c63747f0154f19301..03ca303afb0750e03dde69ab830b692902b3120f 100644 (file)
--- a/buildconfigs/mk.linux-2.4-xen0
+++ b/buildconfigs/mk.linux-2.4-xen0
@@ -12,7 +12,7 @@ include buildconfigs/Rules.mk
 .PHONY: build clean delete
 
 # The real action starts here!
-build: $(LINUX_DIR)
+build: $(LINUX_DIR)/include/linux/autoconf.h
        $(MAKE) -C $(LINUX_DIR) ARCH=xen modules
        $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
        $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
@@ -21,7 +21,8 @@ patches/ebtables.diff:
        mkdir -p patches
        wget http://www.cl.cam.ac.uk/netos/xen/downloads/ebtables-brnf-5_vs_2.4.27.diff.gz -O- | gunzip -c > $@
 
-$(LINUX_DIR):  pristine-linux-$(LINUX_VER) patches/ebtables.diff
+$(LINUX_DIR)/include/linux/autoconf.h: patches/ebtables.diff
+$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
        rm -rf $(LINUX_DIR)
        cp -al pristine-linux-$(LINUX_VER) $(LINUX_DIR)
        # Apply arch-xen patches

diff --git a/buildconfigs/mk.linux-2.4-xenU b/buildconfigs/mk.linux-2.4-xenU
index e4d071e8463c2c71483d2b6daf22d519dc6adcc1..b7d5da432510ab23830ab1b4ecc4db48ed9c0fe3 100644 (file)
--- a/buildconfigs/mk.linux-2.4-xenU
+++ b/buildconfigs/mk.linux-2.4-xenU
@@ -12,12 +12,12 @@ include buildconfigs/Rules.mk
 .PHONY: build clean delete
 
 # The real action starts here!
-build: $(LINUX_DIR)
+build: $(LINUX_DIR)/include/linux/autoconf.h
        $(MAKE) -C $(LINUX_DIR) ARCH=xen modules        
        $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
        $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
 
-$(LINUX_DIR):  pristine-linux-$(LINUX_VER)
+$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
        rm -rf $(LINUX_DIR)
        cp -al pristine-linux-$(LINUX_VER) $(LINUX_DIR)
        # Apply arch-xen patches

diff --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0
index a2a8551ad75ea7f06247b04026b04e22a0e9c654..7e1020941e9b961f7d2af6cec6e6bf2e76543b02 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xen0
+++ b/buildconfigs/mk.linux-2.6-xen0
@@ -11,13 +11,13 @@ include buildconfigs/Rules.mk
 
 .PHONY: build clean delete
 
-build: $(LINUX_DIR)
+build: $(LINUX_DIR)/include/linux/autoconf.h
        $(MAKE) -C $(LINUX_DIR) ARCH=xen modules
        $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
        $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
 
 # The real action starts here!
-$(LINUX_DIR):  pristine-linux-$(LINUX_VER)
+$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
        rm -rf $(LINUX_DIR)
        cp -al pristine-linux-$(LINUX_VER) $(LINUX_DIR)
        # Apply arch-xen patches

diff --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU
index 70841551b514b5e1cd611fce99175e27f72fdc59..2b96fc4467375afe03e5d6ab37f0e27b5b67bbaf 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xenU
+++ b/buildconfigs/mk.linux-2.6-xenU
@@ -12,13 +12,13 @@ include buildconfigs/Rules.mk
 .PHONY: build clean delete
 
 # The real action starts here!
-build: $(LINUX_DIR)
+build: $(LINUX_DIR)/include/linux/autoconf.h
        $(MAKE) -C $(LINUX_DIR) ARCH=xen modules
        $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_MOD_PATH=$(INSTALL_DIR) modules_install
        $(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(INSTALL_DIR) install
 
 
-$(LINUX_DIR):  pristine-linux-$(LINUX_VER)
+$(LINUX_DIR)/include/linux/autoconf.h: pristine-linux-$(LINUX_VER)
        rm -rf $(LINUX_DIR)
        cp -al pristine-linux-$(LINUX_VER) $(LINUX_DIR)
        # Apply arch-xen patches